Merge branch 'reloc'
authorWolfgang Denk <[email protected]>
Thu, 8 Oct 2009 22:03:18 +0000 (00:03 +0200)
committerWolfgang Denk <[email protected]>
Thu, 8 Oct 2009 22:03:18 +0000 (00:03 +0200)

Trivial merge